namespace Ltf.Diffs
{
	partial class MergeOutputControl
	{
		/// <summary> 
		/// Required designer variable.
		/// </summary>
		private System.ComponentModel.IContainer components = null;

		/// <summary> 
		/// Clean up any resources being used.
		/// </summary>
		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
		protected override void Dispose(bool disposing)
		{
			if (disposing && (components != null))
			{
				components.Dispose();
			}
			base.Dispose(disposing);
		}

		#region Component Designer generated code

		/// <summary> 
		/// Required method for Designer support - do not modify 
		/// the contents of this method with the code editor.
		/// </summary>
		private void InitializeComponent()
		{
			this.components = new System.ComponentModel.Container();
			this.cmsConflicts = new System.Windows.Forms.ContextMenuStrip(this.components);
			this.useMineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.useTheirsServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.useMineBeforeTheirsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.useMineAfterTheirsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.useNeiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.useAllMineWorkingCopyFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.useAllTheirServerFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.undoAllMergesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.redoAllMergesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.editSectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.tsmUndoMerge = new System.Windows.Forms.ToolStripMenuItem();
			this.tsmRedoMerge = new System.Windows.Forms.ToolStripMenuItem();
			this.tsmUndoResolution = new System.Windows.Forms.ToolStripMenuItem();
			this.cmsMerges = new System.Windows.Forms.ContextMenuStrip(this.components);
			this.undoMergeBelowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.redoMergeBelowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.undoResolutionBelowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.undoMergeAboveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.redoMergeAboveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.undoResolutionAboveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.editSectionToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
			this.textBox1 = new System.Windows.Forms.TextBox();
			this.sciOutput = new Ltf.Diffs.ScintillaExtra();
			this.editMergeSectionBelowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.editMergeSectionAboveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
			this.cmsConflicts.SuspendLayout();
			this.cmsMerges.SuspendLayout();
			this.SuspendLayout();
			// 
			// cmsConflicts
			// 
			this.cmsConflicts.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.useMineToolStripMenuItem,
            this.useTheirsServerToolStripMenuItem,
            this.useMineBeforeTheirsToolStripMenuItem,
            this.useMineAfterTheirsToolStripMenuItem,
            this.useNeiToolStripMenuItem,
            this.useAllMineWorkingCopyFileToolStripMenuItem,
            this.useAllTheirServerFileToolStripMenuItem,
            this.undoAllMergesToolStripMenuItem,
            this.redoAllMergesToolStripMenuItem,
            this.editSectionToolStripMenuItem});
			this.cmsConflicts.Name = "contextMenuStrip1";
			this.cmsConflicts.Size = new System.Drawing.Size(237, 224);
			this.cmsConflicts.Opening += new System.ComponentModel.CancelEventHandler(this.cmsConflicts_Opening);
			// 
			// useMineToolStripMenuItem
			// 
			this.useMineToolStripMenuItem.Name = "useMineToolStripMenuItem";
			this.useMineToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
			this.useMineToolStripMenuItem.Text = "Use &Mine (Working Copy)";
			this.useMineToolStripMenuItem.Click += new System.EventHandler(this.useMineToolStripMenuItem_Click);
			// 
			// useTheirsServerToolStripMenuItem
			// 
			this.useTheirsServerToolStripMenuItem.Name = "useTheirsServerToolStripMenuItem";
			this.useTheirsServerToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
			this.useTheirsServerToolStripMenuItem.Text = "Use &Theirs (Server)";
			this.useTheirsServerToolStripMenuItem.Click += new System.EventHandler(this.useTheirsServerToolStripMenuItem_Click);
			// 
			// useMineBeforeTheirsToolStripMenuItem
			// 
			this.useMineBeforeTheirsToolStripMenuItem.Name = "useMineBeforeTheirsToolStripMenuItem";
			this.useMineBeforeTheirsToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
			this.useMineBeforeTheirsToolStripMenuItem.Text = "Use mine &Before Theirs";
			this.useMineBeforeTheirsToolStripMenuItem.Click += new System.EventHandler(this.useMineBeforeTheirsToolStripMenuItem_Click);
			// 
			// useMineAfterTheirsToolStripMenuItem
			// 
			this.useMineAfterTheirsToolStripMenuItem.Name = "useMineAfterTheirsToolStripMenuItem";
			this.useMineAfterTheirsToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
			this.useMineAfterTheirsToolStripMenuItem.Text = "Use mine &After Theirs";
			this.useMineAfterTheirsToolStripMenuItem.Click += new System.EventHandler(this.useMineAfterTheirsToolStripMenuItem_Click);
			// 
			// useNeiToolStripMenuItem
			// 
			this.useNeiToolStripMenuItem.Name = "useNeiToolStripMenuItem";
			this.useNeiToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
			this.useNeiToolStripMenuItem.Text = "Use &Neither (no lines)";
			this.useNeiToolStripMenuItem.Click += new System.EventHandler(this.useNeitherToolStripMenuItem_Click);
			// 
			// useAllMineWorkingCopyFileToolStripMenuItem
			// 
			this.useAllMineWorkingCopyFileToolStripMenuItem.Name = "useAllMineWorkingCopyFileToolStripMenuItem";
			this.useAllMineWorkingCopyFileToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
			this.useAllMineWorkingCopyFileToolStripMenuItem.Text = "Use all mine (&Working Copy) file";
			this.useAllMineWorkingCopyFileToolStripMenuItem.Click += new System.EventHandler(this.useAllMineWorkingCopyFileToolStripMenuItem_Click);
			// 
			// useAllTheirServerFileToolStripMenuItem
			// 
			this.useAllTheirServerFileToolStripMenuItem.Name = "useAllTheirServerFileToolStripMenuItem";
			this.useAllTheirServerFileToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
			this.useAllTheirServerFileToolStripMenuItem.Text = "Use all their(&Server) file";
			this.useAllTheirServerFileToolStripMenuItem.Click += new System.EventHandler(this.useAllTheirServerFileToolStripMenuItem_Click);
			// 
			// undoAllMergesToolStripMenuItem
			// 
			this.undoAllMergesToolStripMenuItem.Name = "undoAllMergesToolStripMenuItem";
			this.undoAllMergesToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
			this.undoAllMergesToolStripMenuItem.Text = "&Undo all merges";
			this.undoAllMergesToolStripMenuItem.Click += new System.EventHandler(this.undoAllMergesToolStripMenuItem_Click);
			// 
			// redoAllMergesToolStripMenuItem
			// 
			this.redoAllMergesToolStripMenuItem.Name = "redoAllMergesToolStripMenuItem";
			this.redoAllMergesToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
			this.redoAllMergesToolStripMenuItem.Text = "&Redo all merges";
			this.redoAllMergesToolStripMenuItem.Click += new System.EventHandler(this.redoAllMergesToolStripMenuItem_Click);
			// 
			// editSectionToolStripMenuItem
			// 
			this.editSectionToolStripMenuItem.Name = "editSectionToolStripMenuItem";
			this.editSectionToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
			this.editSectionToolStripMenuItem.Text = "&Edit section";
			this.editSectionToolStripMenuItem.Click += new System.EventHandler(this.editSectionToolStripMenuItem_Click);
			// 
			// tsmUndoMerge
			// 
			this.tsmUndoMerge.Name = "tsmUndoMerge";
			this.tsmUndoMerge.Size = new System.Drawing.Size(193, 22);
			this.tsmUndoMerge.Text = "&Undo merge";
			this.tsmUndoMerge.Click += new System.EventHandler(this.tsmUndoMerge_Click);
			// 
			// tsmRedoMerge
			// 
			this.tsmRedoMerge.Name = "tsmRedoMerge";
			this.tsmRedoMerge.Size = new System.Drawing.Size(193, 22);
			this.tsmRedoMerge.Text = "&Redo merge";
			this.tsmRedoMerge.Click += new System.EventHandler(this.tsmRedoMerge_Click);
			// 
			// tsmUndoResolution
			// 
			this.tsmUndoResolution.Name = "tsmUndoResolution";
			this.tsmUndoResolution.Size = new System.Drawing.Size(193, 22);
			this.tsmUndoResolution.Text = "Undo &Resolution";
			this.tsmUndoResolution.Click += new System.EventHandler(this.tsmUndoResolution_Click);
			// 
			// cmsMerges
			// 
			this.cmsMerges.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.tsmUndoMerge,
            this.tsmRedoMerge,
            this.tsmUndoResolution,
            this.undoMergeBelowToolStripMenuItem,
            this.redoMergeBelowToolStripMenuItem,
            this.undoResolutionBelowToolStripMenuItem,
            this.undoMergeAboveToolStripMenuItem,
            this.redoMergeAboveToolStripMenuItem,
            this.undoResolutionAboveToolStripMenuItem,
            this.editSectionToolStripMenuItem1,
            this.editMergeSectionBelowToolStripMenuItem,
            this.editMergeSectionAboveToolStripMenuItem});
			this.cmsMerges.Name = "contextMenuStrip1";
			this.cmsMerges.Size = new System.Drawing.Size(207, 290);
			// 
			// undoMergeBelowToolStripMenuItem
			// 
			this.undoMergeBelowToolStripMenuItem.Name = "undoMergeBelowToolStripMenuItem";
			this.undoMergeBelowToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
			this.undoMergeBelowToolStripMenuItem.Text = "Undo merge below";
			this.undoMergeBelowToolStripMenuItem.Click += new System.EventHandler(this.undoMergeBelowToolStripMenuItem_Click);
			// 
			// redoMergeBelowToolStripMenuItem
			// 
			this.redoMergeBelowToolStripMenuItem.Name = "redoMergeBelowToolStripMenuItem";
			this.redoMergeBelowToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
			this.redoMergeBelowToolStripMenuItem.Text = "Redo merge below";
			this.redoMergeBelowToolStripMenuItem.Click += new System.EventHandler(this.redoMergeBelowToolStripMenuItem_Click);
			// 
			// undoResolutionBelowToolStripMenuItem
			// 
			this.undoResolutionBelowToolStripMenuItem.Name = "undoResolutionBelowToolStripMenuItem";
			this.undoResolutionBelowToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
			this.undoResolutionBelowToolStripMenuItem.Text = "Undo resolution below";
			this.undoResolutionBelowToolStripMenuItem.Click += new System.EventHandler(this.undoResolutionBelowToolStripMenuItem_Click);
			// 
			// undoMergeAboveToolStripMenuItem
			// 
			this.undoMergeAboveToolStripMenuItem.Name = "undoMergeAboveToolStripMenuItem";
			this.undoMergeAboveToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
			this.undoMergeAboveToolStripMenuItem.Text = "Undo merge above";
			this.undoMergeAboveToolStripMenuItem.Click += new System.EventHandler(this.undoMergeAboveToolStripMenuItem_Click);
			// 
			// redoMergeAboveToolStripMenuItem
			// 
			this.redoMergeAboveToolStripMenuItem.Name = "redoMergeAboveToolStripMenuItem";
			this.redoMergeAboveToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
			this.redoMergeAboveToolStripMenuItem.Text = "Redo merge above";
			this.redoMergeAboveToolStripMenuItem.Click += new System.EventHandler(this.redoMergeAboveToolStripMenuItem_Click);
			// 
			// undoResolutionAboveToolStripMenuItem
			// 
			this.undoResolutionAboveToolStripMenuItem.Name = "undoResolutionAboveToolStripMenuItem";
			this.undoResolutionAboveToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
			this.undoResolutionAboveToolStripMenuItem.Text = "Undo resolution above";
			this.undoResolutionAboveToolStripMenuItem.Click += new System.EventHandler(this.undoResolutionAboveToolStripMenuItem_Click);
			// 
			// editSectionToolStripMenuItem1
			// 
			this.editSectionToolStripMenuItem1.Name = "editSectionToolStripMenuItem1";
			this.editSectionToolStripMenuItem1.Size = new System.Drawing.Size(206, 22);
			this.editSectionToolStripMenuItem1.Text = "&Edit merge section";
			this.editSectionToolStripMenuItem1.Click += new System.EventHandler(this.editmergeSectionToolStripMenuItem_Click);
			// 
			// textBox1
			// 
			this.textBox1.BackColor = System.Drawing.SystemColors.Control;
			this.textBox1.Dock = System.Windows.Forms.DockStyle.Top;
			this.textBox1.Location = new System.Drawing.Point(0, 0);
			this.textBox1.Name = "textBox1";
			this.textBox1.ReadOnly = true;
			this.textBox1.Size = new System.Drawing.Size(502, 20);
			this.textBox1.TabIndex = 2;
			this.textBox1.Text = "Merged Output:";
			// 
			// sciOutput
			// 
			this.sciOutput.Configuration = null;
			this.sciOutput.ConfigurationLanguage = null;
			this.sciOutput.Dock = System.Windows.Forms.DockStyle.Fill;
			this.sciOutput.LegacyConfiguration = null;
			this.sciOutput.Location = new System.Drawing.Point(0, 20);
			this.sciOutput.Name = "sciOutput";
			this.sciOutput.Size = new System.Drawing.Size(502, 366);
			this.sciOutput.SmartIndentingEnabled = false;
			this.sciOutput.TabIndex = 3;
			// 
			// editMergeSectionBelowToolStripMenuItem
			// 
			this.editMergeSectionBelowToolStripMenuItem.Name = "editMergeSectionBelowToolStripMenuItem";
			this.editMergeSectionBelowToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
			this.editMergeSectionBelowToolStripMenuItem.Text = "Edit merge section below";
			this.editMergeSectionBelowToolStripMenuItem.Click += new System.EventHandler(this.editMergeSectionBelowToolStripMenuItem_Click);
			// 
			// editMergeSectionAboveToolStripMenuItem
			// 
			this.editMergeSectionAboveToolStripMenuItem.Name = "editMergeSectionAboveToolStripMenuItem";
			this.editMergeSectionAboveToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
			this.editMergeSectionAboveToolStripMenuItem.Text = "Edit merge section above";
			this.editMergeSectionAboveToolStripMenuItem.Click += new System.EventHandler(this.editMergeSectionAboveToolStripMenuItem_Click);
			// 
			// MergeOutputControl
			// 
			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
			this.Controls.Add(this.sciOutput);
			this.Controls.Add(this.textBox1);
			this.Name = "MergeOutputControl";
			this.Size = new System.Drawing.Size(502, 386);
			this.cmsConflicts.ResumeLayout(false);
			this.cmsMerges.ResumeLayout(false);
			this.ResumeLayout(false);
			this.PerformLayout();

		}

		#endregion

		private System.Windows.Forms.ContextMenuStrip cmsConflicts;
		private System.Windows.Forms.ToolStripMenuItem useMineToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem useTheirsServerToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem useMineBeforeTheirsToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem useMineAfterTheirsToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem useNeiToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem useAllMineWorkingCopyFileToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem useAllTheirServerFileToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem tsmUndoMerge;
		private System.Windows.Forms.ToolStripMenuItem tsmRedoMerge;
		private System.Windows.Forms.ToolStripMenuItem tsmUndoResolution;
		private System.Windows.Forms.ContextMenuStrip cmsMerges;
		private System.Windows.Forms.ToolStripMenuItem undoMergeBelowToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem redoMergeBelowToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem undoResolutionBelowToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem undoMergeAboveToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem redoMergeAboveToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem undoResolutionAboveToolStripMenuItem;
		private System.Windows.Forms.TextBox textBox1;
		private ScintillaExtra sciOutput;
		private System.Windows.Forms.ToolStripMenuItem undoAllMergesToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem redoAllMergesToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem editSectionToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem editSectionToolStripMenuItem1;
		private System.Windows.Forms.ToolStripMenuItem editMergeSectionBelowToolStripMenuItem;
		private System.Windows.Forms.ToolStripMenuItem editMergeSectionAboveToolStripMenuItem;
	}
}
